merge-conflicts

Git client with deterministic merge-conflict auto-resolution

Details